Skip to content

Conversation

JacobCoffee
Copy link
Member

@JacobCoffee JacobCoffee commented Sep 19, 2025

@JacobCoffee JacobCoffee marked this pull request as ready for review September 19, 2025 10:35
Copy link
Member

@savannahostrowski savannahostrowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that GitHub is supporting macOS Intel until Fall 2027, I think we can just bump to the macos-15 runner image instead of using emulation.

@bedevere-app
Copy link

bedevere-app bot commented Sep 20, 2025

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@hugovk hugovk changed the title gh-139153: Use Rosetta for x86_64 macOS JIT builds on ARM runners gh-139153: Use macos-15-intel for x86_64 macOS JIT builds on ARM runners Sep 29, 2025
@hugovk hugovk changed the title gh-139153: Use macos-15-intel for x86_64 macOS JIT builds on ARM runners gh-137638: Use macos-15-intel for x86_64 macOS JIT builds on ARM runners Sep 29, 2025
@hugovk
Copy link
Member

hugovk commented Sep 29, 2025

Lint error:

.github/workflows/jit.yml:84:21: label "macos-15-intel" is unknown. available labels are "windows-latest", "windows-latest-8-cores", "windows-2025", "windows-2022", "windows-2019", "ubuntu-latest", "ubuntu-latest-4-cores", "ubuntu-latest-8-cores", "ubuntu-latest-16-cores", "ubuntu-24.04", "ubuntu-24.04-arm", "ubuntu-22.04", "ubuntu-22.04-arm", "ubuntu-20.04", "macos-latest", "macos-latest-xl", "macos-latest-xlarge", "macos-latest-large", "macos-15-xlarge", "macos-15-large", "macos-15", "macos-14-xl", "macos-14-xlarge", "macos-14-large", "macos-14", "macos-13-xl", "macos-13-xlarge", "macos-13-large", "macos-13", "self-hosted", "x64", "arm", "arm64", "linux", "macos", "windows", "windows-11-arm". if it is a custom label for self-hosted runner, set list of labels in actionlint.yaml config file [runner-label]
   |
84 |             runner: macos-15-intel
   |                     ^~~~~~~~~~~~~~

To fix, add macos-15-intel to:

self-hosted-runner:
# Pending https://github.com/rhysd/actionlint/issues/533
labels: ["windows-11-arm"]

And reference rhysd/actionlint#571.

(It's been fixed in rhysd/actionlint#572 but pending release.)

Please could you also update macos-13 to macos-15-intel in the other workflows?

Copy link
Member

@savannahostrowski savannahostrowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I'm assuming that you'll update the other actions as part of this PR, so I'll hold off on merging unless you tell me otherwise.

@hugovk hugovk changed the title gh-137638: Use macos-15-intel for x86_64 macOS JIT builds on ARM runners gh-137638: Use macos-15-intel in GitHub Actions Oct 2, 2025
JacobCoffee and others added 2 commits October 2, 2025 18:36
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
@webknjaz
Copy link
Contributor

webknjaz commented Oct 2, 2025

@JacobCoffee perhaps link actions/runner-images#13045 or some other announcements in the PR description for context? Looks like GH sent out an email blast about this just a couple hours ago.

runner: macos-15-intel
- target: aarch64-apple-darwin/clang
architecture: aarch64
runner: macos-14
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe update arm runners to 15 in a separate follow-up PR (since this one is declared to be about handling intel)

JacobCoffee and others added 3 commits October 3, 2025 10:57
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Copy link
Member

@hugovk hugovk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@hugovk hugovk enabled auto-merge (squash) October 3, 2025 19:10
@hugovk hugovk merged commit 1ae9250 into python:main Oct 3, 2025
66 checks passed
@miss-islington-app
Copy link

Thanks @JacobCoffee for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11, 3.12, 3.13, 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 3, 2025
(cherry picked from commit 1ae9250)

Co-authored-by: Jacob Coffee <[email protected]>
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: Hugo van Kemenade <[email protected]>
@miss-islington-app
Copy link

Sorry, @JacobCoffee and @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 1ae92503647328544866f9586f57eec285e1949a 3.13

@miss-islington-app
Copy link

Sorry, @JacobCoffee and @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 1ae92503647328544866f9586f57eec285e1949a 3.12

@bedevere-app
Copy link

bedevere-app bot commented Oct 3, 2025

GH-139545 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Oct 3, 2025
@miss-islington-app
Copy link

Sorry, @JacobCoffee and @hugovk, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 1ae92503647328544866f9586f57eec285e1949a 3.11

@miss-islington-app
Copy link

Sorry, @JacobCoffee and @hugovk, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 1ae92503647328544866f9586f57eec285e1949a 3.10

hugovk added a commit that referenced this pull request Oct 3, 2025
…139545)

Co-authored-by: Jacob Coffee <[email protected]>
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: Hugo van Kemenade <[email protected]>
@bedevere-bot
Copy link

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot s390x Fedora Stable Refleaks 3.x (tier-3) has failed when building commit 1ae9250.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/#/builders/1641/builds/1003) and take a look at the build logs.
  4. Check if the failure is related to this commit (1ae9250) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#/builders/1641/builds/1003

Failed tests:

  • test.test_os.test_os
  • test_socket

Failed subtests:

  • test_aead_aes_gcm - test.test_socket.LinuxKernelCryptoAPI.test_aead_aes_gcm
  • test_timerfd_interval - test.test_os.test_os.TimerfdTests.test_timerfd_interval

Summary of the results of the build (if available):

==

Click to see traceback logs
Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-s390x.refleak/build/Lib/test/test_os/test_os.py", line 3837, in test_timerfd_interval
    self.assertEqual(self.read_count_signaled(fd), count)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 4 != 3


Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-s390x.refleak/build/Lib/test/test_socket.py", line 7165, in test_aead_aes_gcm
    op.sendall(plain)
    ~~~~~~~~~~^^^^^^^
OSError: [Errno 22] Invalid argument

danigm pushed a commit to openSUSE-Python/cpython that referenced this pull request Oct 7, 2025
Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>
Co-authored-by: Hugo van Kemenade <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[infra][CI] Deal with the sunset of macos-13 @ GHA by Sep 1, 2025
6 participants